Add col_clear; Also: Small reformatting and whitespace changes

svn path=/trunk/; revision=34332

1 files changed, 283 insertions, 270 deletions

diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index 66e3468382..ab011e0d63 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -42,7 +42,6 @@
 #include <epan/expert.h>
 #include <packet-tcp.h>
 #include <packet-udp.h>
-#include <stdio.h>
 
 /* Initialize the protocol and registered fields */
 static int proto_reload = -1;
@@ -511,7 +510,8 @@ get_reload_message_length(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
   return length;
 }
 
-static int get_opaque_length(tvbuff_t *tvb, guint16 offset, guint16 length_size)
+static int
+get_opaque_length(tvbuff_t *tvb, guint16 offset, guint16 length_size)
 {
   int length = -1;
 
@@ -533,7 +533,8 @@ static int get_opaque_length(tvbuff_t *tvb, guint16 offset, guint16 length_size)
   return length;
 }
 
-static int dissect_opaque(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, int anchor_index, guint16 offset, guint16 length_size, gint32 field_length)
+static int
+dissect_opaque(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, int anchor_index, guint16 offset, guint16 length_size, gint32 field_length)
 {
   proto_tree *opaque_tree;
   proto_item *ti_anchor;
@@ -579,7 +580,8 @@ static int dissect_opaque(tvbuff_t *tvb, packet_info *pinfo,proto_tree *tree, in
   return (length_size + length);
 }
 
-static int dissect_destination(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
+static int
+dissect_destination(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
 {
   guint8 destination_length;
   guint8 destination_type;
@@ -635,7 +637,8 @@ static int dissect_destination(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
 }
 
 
-static int dissect_destination_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *list_tree, guint16 offset, guint16 length)
+static int
+dissect_destination_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *list_tree, guint16 offset, guint16 length)
 {
   gint local_offset = 0;
   gint local_increment;
@@ -647,7 +650,8 @@ static int dissect_destination_list(tvbuff_t *tvb, packet_info *pinfo, proto_tre
   return local_offset;
 }
 
-static int dissect_probe_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
+static int
+dissect_probe_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
 {
   proto_item *ti_probe_information;
   proto_tree *probe_information_tree;
@@ -699,7 +703,8 @@ static int dissect_probe_information(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 
 
-static int dissect_ipaddressport(tvbuff_t *tvb, proto_tree *tree, guint16 offset)
+static int
+dissect_ipaddressport(tvbuff_t *tvb, proto_tree *tree, guint16 offset)
 {
   proto_item *ti_ipaddressport;
   proto_tree *ipaddressport_tree;
@@ -733,7 +738,8 @@ static int dissect_ipaddressport(tvbuff_t *tvb, proto_tree *tree, guint16 offset
   return (int) (2 + ipaddressport_length);
 }
 
-static int dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
+static int
+dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
 {
   proto_item *ti_icecandidates;
   proto_tree *icecandidates_tree;
@@ -886,7 +892,8 @@ static int dissect_icecandidates(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
   return (2 + icecandidates_length);
 }
 
-static int dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
+static int
+dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
 {
   proto_item *ti_attachreqans;
   proto_tree *attachreqans_tree;
@@ -946,7 +953,8 @@ static int dissect_attachreqans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
   return local_offset;
 }
 
-static int dissect_storeddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
+static int
+dissect_storeddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
 {
   proto_item *ti_storeddata;
   proto_item *storeddata_tree;
@@ -976,7 +984,8 @@ static int dissect_storeddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
   return (storeddata_length + 4);
 }
 
-static int dissect_kinddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
+static int
+dissect_kinddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
 {
   proto_item *ti_kinddata;
   proto_item *kinddata_tree;
@@ -1013,7 +1022,8 @@ static int dissect_kinddata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   return local_offset;
 }
 
-static int dissect_storereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
+static int
+dissect_storereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
 {
   proto_item * ti_storereq;
   proto_tree * storereq_tree;
@@ -1064,7 +1074,8 @@ static int dissect_storereq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   return local_offset;
 }
 
-static int dissect_fetchans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
+static int
+dissect_fetchans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
 {
   proto_item *ti_fetchans;
   proto_tree *fetchans_tree;
@@ -1095,7 +1106,8 @@ static int dissect_fetchans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 }
 
 
-static int dissect_statans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
+static int
+dissect_statans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 offset, guint16 length)
 {
   proto_item *ti_statans;
   proto_tree *statans_tree;
@@ -1135,7 +1147,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint effective_length;
   guint msg_length;
   guint16 offset;
-  conversation_t *conversation = NULL;
+  conversation_t *conversation;
   reload_conv_info_t *reload_info;
   reload_transaction_t * reload_trans;
   emem_tree_key_t transaction_id_key[2];
@@ -1183,6 +1195,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   /* The message seems to be a valid reLOAD message! */
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "RELOAD");
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* Create the transaction key which may be used to track the conversation */
   transaction_id[0] = tvb_get_ntohl(tvb, 20);
@@ -1526,28 +1539,28 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                      "%s-%s", msg_method_str, msg_class_str);
     offset += 2;
     switch(MSGCODE_TO_METHOD(message_code)) {
-      case METHOD_ROUTEQUERY:
-        {
-          if (IS_REQUEST(message_code)) {
-            proto_item *ti_message_body;
-            proto_tree *message_body_tree;
-            ti_message_body = proto_tree_add_item(message_contents_tree, hf_reload_message_body, tvb, offset, 4 + message_body_length, FALSE);
-            message_body_tree = proto_item_add_subtree(ti_message_body, ett_reload_message_body);
-            proto_tree_add_uint(message_body_tree, hf_reload_opaque_length_uint32, tvb, offset, 4, message_body_length);
-            {
-              proto_item * ti_routequeryreq;
-              proto_tree * routequeryreq_tree;
-              int destination_length;
-              ti_routequeryreq = proto_tree_add_item(message_body_tree, hf_reload_routequeryreq, tvb, offset+4, message_body_length, FALSE);
-              routequeryreq_tree = proto_item_add_subtree(ti_routequeryreq, ett_reload_routequeryreq);
-              proto_tree_add_item(routequeryreq_tree, hf_reload_sendupdate, tvb, offset+4, 1, FALSE);
-              destination_length = dissect_destination(tvb, pinfo, routequeryreq_tree, offset + 4 + 1, message_body_length - 1 - 2);
-              dissect_opaque(tvb, pinfo, routequeryreq_tree, hf_reload_overlay_specific, offset + 4 + 1 + destination_length, 2, (message_body_length - 1 - destination_length));
-            }
+    case METHOD_ROUTEQUERY:
+      {
+        if (IS_REQUEST(message_code)) {
+          proto_item *ti_message_body;
+          proto_tree *message_body_tree;
+          ti_message_body = proto_tree_add_item(message_contents_tree, hf_reload_message_body, tvb, offset, 4 + message_body_length, FALSE);
+          message_body_tree = proto_item_add_subtree(ti_message_body, ett_reload_message_body);
+          proto_tree_add_uint(message_body_tree, hf_reload_opaque_length_uint32, tvb, offset, 4, message_body_length);
+          {
+            proto_item * ti_routequeryreq;
+            proto_tree * routequeryreq_tree;
+            int destination_length;
+            ti_routequeryreq = proto_tree_add_item(message_body_tree, hf_reload_routequeryreq, tvb, offset+4, message_body_length, FALSE);
+            routequeryreq_tree = proto_item_add_subtree(ti_routequeryreq, ett_reload_routequeryreq);
+            proto_tree_add_item(routequeryreq_tree, hf_reload_sendupdate, tvb, offset+4, 1, FALSE);
+            destination_length = dissect_destination(tvb, pinfo, routequeryreq_tree, offset + 4 + 1, message_body_length - 1 - 2);
+            dissect_opaque(tvb, pinfo, routequeryreq_tree, hf_reload_overlay_specific, offset + 4 + 1 + destination_length, 2, (message_body_length - 1 - destination_length));
           }
-          /* Answer is entirely Overlay-specific */
         }
-        break;
+          /* Answer is entirely Overlay-specific */
+      }
+      break;
 
     case METHOD_PROBE:
       {
@@ -2003,7 +2016,7 @@ dissect_reload_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
   if (dissect_reload_message(tvb, pinfo, tree) == 0) {
     /*
-     * It wasn't a valid STUN message, and wasn't
+     * It wasn't a valid RELOAD message, and wasn't
      * dissected as such.
      */
     return FALSE;
@@ -2017,7 +2030,7 @@ proto_register_reload(void)
   module_t *reload_module;
   static hf_register_info hf[] = {
     { &hf_reload_response_in,
-      { "Response In",	"reload.response-in", FT_FRAMENUM,
+      { "Response In",  "reload.response-in", FT_FRAMENUM,
         BASE_NONE, NULL, 0x0, "The response to this ReLOAD Request is in this frame", HFILL }
     },
     { &hf_reload_response_to,
@@ -2033,32 +2046,32 @@ proto_register_reload(void)
         BASE_NONE, NULL, 0x0, "This is a duplicate of ReLOAD message in this frame", HFILL }
     },
     { &hf_reload_forwarding,
-      { "Forwarding Header",		"reload.forwarding",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "Forwarding Header",    "reload.forwarding",  FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_token,
-      { "ReLOAD token",	"reload.forwarding.token",	FT_UINT32,
-        BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
+      { "ReLOAD token", "reload.forwarding.token",  FT_UINT32,
+        BASE_HEX, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_overlay,
-      { "Overlay",	"reload.forwarding.overlay",	FT_UINT32,
-        BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
+      { "Overlay",  "reload.forwarding.overlay",  FT_UINT32,
+        BASE_HEX, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_configuration_sequence,
-      { "Configuration Sequence",	"reload.forwarding.configuration_sequence",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Configuration Sequence", "reload.forwarding.configuration_sequence", FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_version,
-      { "Version",	"reload.forwarding.version",	FT_UINT8,
-        BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
+      { "Version",  "reload.forwarding.version",  FT_UINT8,
+        BASE_HEX, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_ttl,
-      { "TTL",	"reload.forwarding.ttl",	FT_UINT8,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "TTL",  "reload.forwarding.ttl",  FT_UINT8,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_fragment_flag,
-      { "Fragment",	"reload.forwarding.fragment",	FT_UINT32,
-        BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
+      { "Fragment", "reload.forwarding.fragment", FT_UINT32,
+        BASE_HEX, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_fragment_fragmented,
       { "Fragmented Bit", "reload.forwarding.fragment.fragmented", FT_BOOLEAN, 1, TFS(&tfs_set_notset), 0x0,
@@ -2073,88 +2086,88 @@ proto_register_reload(void)
         NULL, HFILL }
     },
     { &hf_reload_fragment_offset,
-      { "Fragment offset","reload.forwarding.fragment.offset",	FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Fragment offset","reload.forwarding.fragment.offset",  FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_length,
-      { "Length",	"reload.forwarding.length",	FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Length", "reload.forwarding.length", FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_trans_id,
-      { "Transaction ID",	"reload.forwarding.trans_id",	FT_UINT64,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Transaction ID", "reload.forwarding.trans_id", FT_UINT64,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_max_response_length,
-      { "Max response length",	"reload.forwarding.max_response_length",	FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Max response length",  "reload.forwarding.max_response_length",  FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_via_list_length,
-      { "Via-list length",	"reload.forwarding.via_list.length",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Via-list length",  "reload.forwarding.via_list.length",  FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_destination_list_length,
-      { "Destination list length",	"reload.forwarding.destination_list.length",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Destination list length",  "reload.forwarding.destination_list.length",  FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_options_length,
-      { "Options length",	"reload.forwarding.options.length",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Options length", "reload.forwarding.options.length", FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_via_list,
-      { "via list",		"reload.forwarding.via_list",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "via list",   "reload.forwarding.via_list", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_destination,
-      { "Destination",		"reload.forwarding.destination",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "Destination",    "reload.forwarding.destination",  FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_destination_compressed,
-      { "Destination (compressed)", "reload.forwarding.destination.compressed_id",	FT_UINT16,
-        BASE_HEX,	NULL, 	0x0, 	NULL,	HFILL }
+      { "Destination (compressed)", "reload.forwarding.destination.compressed_id",  FT_UINT16,
+        BASE_HEX, NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_destination_type,
-      { "Destination type",    "reload.forwarding.destination.type",	FT_UINT8,
-        BASE_HEX,	VALS(destinationtypes),	0x0,	NULL,	HFILL }
+      { "Destination type",    "reload.forwarding.destination.type",  FT_UINT8,
+        BASE_HEX, VALS(destinationtypes), 0x0,  NULL, HFILL }
     },
     { &hf_reload_destination_length,
-      { "Destination length",		"reload.forwarding.destination.length",	FT_UINT8,
-        BASE_DEC,	NULL, 	0x0, 	NULL,	HFILL }
+      { "Destination length",   "reload.forwarding.destination.length", FT_UINT8,
+        BASE_DEC, NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_node_id,
-      { "node id",		"reload.node_id",	FT_BYTES,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "node id",    "reload.node_id", FT_BYTES,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_resource_id,
-      { "resource id",		"reload.resource_id",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "resource id",    "reload.resource_id", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_destination_data_compressed_id,
-      { "compressed id",		"reload.destination.data.compressed_id",	FT_BYTES,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "compressed id",    "reload.destination.data.compressed_id",  FT_BYTES,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_destination_list,
-      { "destination list",		"reload.forwarding.destination_list",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "destination list",   "reload.forwarding.destination_list", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_forwarding_option,
-      { "forwarding option",		"reload.forwarding.option",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "forwarding option",    "reload.forwarding.option", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_forwarding_option_type,
-      { "forwarding option type",	"reload.forwarding.option.type",	FT_UINT8,
-        BASE_DEC,	VALS(forwardingoptiontypes),	0x0, 	NULL,	HFILL }
+      { "forwarding option type", "reload.forwarding.option.type",  FT_UINT8,
+        BASE_DEC, VALS(forwardingoptiontypes),  0x0,  NULL, HFILL }
     },
     { &hf_reload_forwarding_option_flags,
-      { "forwarding option flags",	"reload.forwarding.option.flags",	FT_UINT8,
-        BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
+      { "forwarding option flags",  "reload.forwarding.option.flags", FT_UINT8,
+        BASE_HEX, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_forwarding_option_length,
-      { "forwarding option length",	"forwarding.option.length",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "forwarding option length", "forwarding.option.length", FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_forwarding_option_data,
-      { "forwarding option data",	"reload.forwarding.option.data",	FT_BYTES,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "forwarding option data", "reload.forwarding.option.data",  FT_BYTES,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_forwarding_option_flag_response_copy,
       { "Response Copy", "reload.forwarding.option.flag.response_copy", FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x0,
@@ -2169,367 +2182,367 @@ proto_register_reload(void)
         NULL, HFILL }
     },
     { &hf_reload_forwarding_option_directresponseforwarding,
-      { "Direct Response Forwarding",	"reload.forwarding.option.direct_response_forwarding",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "Direct Response Forwarding", "reload.forwarding.option.direct_response_forwarding",  FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_attachreqans,
-      { "AttachReqAns",	"reload.attachreqans",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "AttachReqAns", "reload.attachreqans",  FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_ufrag,
-      { "ufrag",	"reload.ufrag",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "ufrag",  "reload.ufrag", FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_password,
-      { "password",	"reload.password",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "password", "reload.password",  FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_role,
-      { "Role",	"reload.role",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Role", "reload.role",  FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidates,
-      { "ice candidates",		"reload.icecandidates",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "ice candidates",   "reload.icecandidates", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidates_length,
-      { "ice candidates length",	"reload.icecandidates.length",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "ice candidates length",  "reload.icecandidates.length",  FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidate,
-      { "ice candidate",		"reload.icecandidate",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "ice candidate",    "reload.icecandidate",  FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidate_relay_addr,
-      { "relay address",		"reload.icecandidate.relay_addr",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "relay address",    "reload.icecandidate.relay_addr", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidate_srflx_addr,
-      { "srflx address",		"reload.icecandidate.srflx_addr",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "srflx address",    "reload.icecandidate.srflx_addr", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidate_prflx_addr,
-      { "prfkx address",		"reload.icecandidate.prflx_addr",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "prfkx address",    "reload.icecandidate.prflx_addr", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_ipaddressport,
-      { "Ip Address Port",		"reload.ipaddressport",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "Ip Address Port",    "reload.ipaddressport", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_ipaddressport_type,
-      { "Ip Address-Port Type",	"reload.ipaddressport.type",	FT_UINT8,
-        BASE_HEX,	VALS(ipaddressporttypes),	0x0, 	NULL,	HFILL }
+      { "Ip Address-Port Type", "reload.ipaddressport.type",  FT_UINT8,
+        BASE_HEX, VALS(ipaddressporttypes), 0x0,  NULL, HFILL }
     },
     { &hf_reload_ipaddressport_length,
-      { "Ip Address-Port Length",	"reload.ipaddressport.length",	FT_UINT8,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ip Address-Port Length", "reload.ipaddressport.length",  FT_UINT8,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_ipv4addr,
-      { "Ipv4 Address",	"reload.ipv4addr",	FT_IPv4,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ipv4 Address", "reload.ipv4addr",  FT_IPv4,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_ipv6addr,
-      { "Ipv6 Address",	"reload.ipv6addr",	FT_IPv6,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ipv6 Address", "reload.ipv6addr",  FT_IPv6,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_port,
-      { "port",	"reload.port",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "port", "reload.port",  FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_overlaylink_type,
-      { "Overlay Link Type",	"reload.overlaylink.type",	FT_UINT8,
-        BASE_DEC,	VALS(overlaylinktypes),	0x0, 	NULL,	HFILL }
+      { "Overlay Link Type",  "reload.overlaylink.type",  FT_UINT8,
+        BASE_DEC, VALS(overlaylinktypes), 0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidate_foundation,
-      { "Ice Candidate foundation",	"reload.icecandidate.foundation",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ice Candidate foundation", "reload.icecandidate.foundation", FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidate_priority,
-      { "Ice Candidate Priority",	"reload.icecandidate.priority",	FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ice Candidate Priority", "reload.icecandidate.priority", FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidate_type,
-      { "Ice Candidate type",	"reload.icecandidate.type",	FT_UINT8,
-        BASE_DEC,	VALS(candtypes),	0x0, 	NULL,	HFILL }
+      { "Ice Candidate type", "reload.icecandidate.type", FT_UINT8,
+        BASE_DEC, VALS(candtypes),  0x0,  NULL, HFILL }
     },
     { &hf_reload_icecandidate_extensions_length,
-      { "Ice Candidate Extensions Length",	"reload.icecandidate.extensions_length",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ice Candidate Extensions Length",  "reload.icecandidate.extensions_length",  FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_iceextension,
-      { "ice Extension",		"reload.iceextension",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "ice Extension",    "reload.iceextension",  FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_iceextension_name,
-      { "Ice Extension Name",	"reload.iceextension.name",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ice Extension Name", "reload.iceextension.name", FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_iceextension_value,
-      { "Ice Extension Value",	"reload.iceextension.value",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ice Extension Value",  "reload.iceextension.value",  FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_sendupdate,
-      { "SendUpdate",	"reload.sendupdate",	FT_BOOLEAN,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "SendUpdate", "reload.sendupdate",  FT_BOOLEAN,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_message_contents,
-      { "message contents",		"reload.message.contents",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "message contents",   "reload.message.contents",  FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_message_code,
-      { "Message Code",	"reload.message.code",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Message Code", "reload.message.code",  FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_message_body,
-      { "Message Body",	"reload.message.body",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Message Body", "reload.message.body",  FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_message_extensions_length,
-      { "Message extensions length",	"reload.message.extensions.length",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Message extensions length",  "reload.message.extensions.length", FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_message_extension,
-      { "message extension",		"reload.message_extension",	FT_NONE,
-        BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
+      { "message extension",    "reload.message_extension", FT_NONE,
+        BASE_NONE,  NULL,   0x0,  NULL, HFILL }
     },
     { &hf_reload_message_extension_type,
-      { "Message extension type",	"reload.message_extension.type",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Message extension type", "reload.message_extension.type",  FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_message_extension_critical,
-      { "Message extension critical",	"reload.message_extension.critical",	FT_BOOLEAN,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Message extension critical", "reload.message_extension.critical",  FT_BOOLEAN,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_message_extension_content,
-      { "Message extension content",	"reload.message_extension.content",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Message extension content",  "reload.message_extension.content", FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_error_response,
-      { "error response",	"reload.error_response",	FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "error response", "reload.error_response",  FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_error_response_code,
-      { "error code",	"reload.error_response.code",	FT_UINT16,
-        BASE_DEC,	VALS(errorcodes),	0x0, 	NULL,	HFILL }
+      { "error code", "reload.error_response.code", FT_UINT16,
+        BASE_DEC, VALS(errorcodes), 0x0,  NULL, HFILL }
     },
     { &hf_reload_error_response_info,
-      { "error info",	"reload.error_response_info",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "error info", "reload.error_response_info", FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_security_block,
-      { "Security Block",	"reload.security_block",	FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Security Block", "reload.security_block",  FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_certificates_length,
-      { "certificates length",	"reload.certificates.length",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "certificates length",  "reload.certificates.length", FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_certificate,
-      { "Certificate",	"reload.certificate",	FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Certificate",  "reload.certificate", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_certificate_type,
-      { "Certificate type",	"reload.certificate.type",	FT_UINT8,
-        BASE_DEC,	VALS(certificatetypes),	0x0, 	NULL,	HFILL }
+      { "Certificate type", "reload.certificate.type",  FT_UINT8,
+        BASE_DEC, VALS(certificatetypes), 0x0,  NULL, HFILL }
     },
     { &hf_reload_certificate_data,
-      { "certificate data",	"reload.certificate.data",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "certificate data", "reload.certificate.data",  FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_signature,
-      { "Signature",	"reload.signature",	FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Signature",  "reload.signature", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_hash_algorithm,
-      { "Hash Algorithm",	"reload.hash_algorithm",	FT_UINT8,
-        BASE_DEC,	VALS(hashalgorithms),	0x0, 	NULL,	HFILL }
+      { "Hash Algorithm", "reload.hash_algorithm",  FT_UINT8,
+        BASE_DEC, VALS(hashalgorithms), 0x0,  NULL, HFILL }
     },
     { &hf_reload_signature_algorithm,
-      { "Signature Algorithm",	"reload.signature_algorithm",	FT_UINT8,
-        BASE_DEC,	VALS(signaturealgorithms),	0x0, 	NULL,	HFILL }
+      { "Signature Algorithm",  "reload.signature_algorithm", FT_UINT8,
+        BASE_DEC, VALS(signaturealgorithms),  0x0,  NULL, HFILL }
     },
     { &hf_reload_signature_identity,
-      { "Signature Identity",	"reload.signature.identity",	FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Signature Identity", "reload.signature.identity",  FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_signature_identity_type,
-      { "Signature Identity Type",	"reload.signature.identity.type",	FT_UINT8,
-        BASE_DEC,	VALS(signatureidentitytypes),	0x0, 	NULL,	HFILL }
+      { "Signature Identity Type",  "reload.signature.identity.type", FT_UINT8,
+        BASE_DEC, VALS(signatureidentitytypes), 0x0,  NULL, HFILL }
     },
     { &hf_reload_signature_identity_length,
-      { "Signature Identity Length",	"reload.signature.identity.length",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Signature Identity Length",  "reload.signature.identity.length", FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_signature_identity_value,
-      { "Signature Identity Value",	"reload.signature.identity.value",	FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Signature Identity Value", "reload.signature.identity.value",  FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_signature_identity_value_certificate_hash,
-      { "Signature Identity Value Certificate Hash",	"reload.signature.identity.value.certificate_hash",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Signature Identity Value Certificate Hash",  "reload.signature.identity.value.certificate_hash", FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_signature_value,
-      { "Signature Value",	"reload.signature.value.",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Signature Value",  "reload.signature.value.",  FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_opaque_length_uint8,
-      { "length",	"reload.opaque.length.8",	FT_UINT8,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "length", "reload.opaque.length.8", FT_UINT8,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_opaque_length_uint16,
-      { "length",	"reload.opaque.length.6",	FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "length", "reload.opaque.length.6", FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_opaque_length_uint32,
-      { "length",	"reload.opaque.length.32",	FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "length", "reload.opaque.length.32",  FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_opaque_data,
-      { "data",	"reload.opaque.length.8",	FT_BYTES,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "data", "reload.opaque.length.8", FT_BYTES,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_routequeryreq,
-      { "RouteQueryReq",	"reload.routequeryreq",	FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "RouteQueryReq",  "reload.routequeryreq", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_overlay_specific,
-      { "Overlay Specific Data",	"reload.overlay.specific.data",	FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Overlay Specific Data",  "reload.overlay.specific.data", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_probereq,
-      { "ProbeReq",	"reload.probereq",	FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "ProbeReq", "reload.probereq",  FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_probe_information,
-      { "Probe Information",	"reload.probe_information", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Probe Information",  "reload.probe_information", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_probe_information_type,
-      { "Probe Information Type",	"reload.probe_information.type", FT_UINT8,
-        BASE_HEX,	VALS(probeinformationtypes),	0x0, 	NULL,	HFILL }
+      { "Probe Information Type", "reload.probe_information.type", FT_UINT8,
+        BASE_HEX, VALS(probeinformationtypes),  0x0,  NULL, HFILL }
     },
     { &hf_reload_responsible_set,
-      { "Responsible Set",	"reload.responsible_set", FT_UINT32,
-        BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
+      { "Responsible Set",  "reload.responsible_set", FT_UINT32,
+        BASE_HEX, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_num_resources,
-      { "Num Resources",	"reload.num_resources", FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Num Resources",  "reload.num_resources", FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_uptime,
-      { "Uptime",	"reload.uptime", FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Uptime", "reload.uptime", FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_probeans,
-      { "Probe Ans",	"reload.probeans", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Probe Ans",  "reload.probeans", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_appattach,
-      { "App Attach Req/Ans",	"reload.appattach", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "App Attach Req/Ans", "reload.appattach", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_application,
-      { "Uptime",	"reload.uptime", FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Uptime", "reload.uptime", FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_ping_response_id,
-      { "Ping Response Id",	"reload.ping.response_id",	FT_UINT64,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ping Response Id", "reload.ping.response_id",  FT_UINT64,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_ping_time,
-      { "Ping Time",	"reload.ping.time",	FT_UINT64,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Ping Time",  "reload.ping.time", FT_UINT64,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_storeddata,
-      { "Stored Data",	"reload.storeddata", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Stored Data",  "reload.storeddata", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_storeddata_length,
-      { "Stored Data length",	"reload.storeddata.length",	FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Stored Data length", "reload.storeddata.length", FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_storeddata_storage_time,
-      { "Stored Data storage time",	"reload.storeddata.storage_time",	FT_UINT64,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Stored Data storage time", "reload.storeddata.storage_time", FT_UINT64,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_storeddata_lifetime,
-      { "Stored Lifetime",	"reload.storeddata.lifetime",	FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Stored Lifetime",  "reload.storeddata.lifetime", FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_kinddata,
-      { "Kind Data",	"reload.kinddata", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Kind Data",  "reload.kinddata", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_kindid,
-      { "Kind Id",	"reload.kindid",	FT_UINT8,
-        BASE_DEC,	VALS(datakindids),	0x0, 	NULL,	HFILL }
+      { "Kind Id",  "reload.kindid",  FT_UINT8,
+        BASE_DEC, VALS(datakindids),  0x0,  NULL, HFILL }
     },
     { &hf_reload_kinddata_generation_counter,
-      { "Generation Counter",	"reload.kinddata.generation_counter",	FT_UINT64,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Generation Counter", "reload.kinddata.generation_counter", FT_UINT64,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_kinddata_values_length,
-      { "Values Length",	"reload.kinddata.values_length",	FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Values Length",  "reload.kinddata.values_length",  FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_storereq,
-      { "StoreReq",	"reload.storereq", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "StoreReq", "reload.storereq", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_store_replica_num,
-      { "replica num",	"reload.store.replica_num",	FT_UINT8,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "replica num",  "reload.store.replica_num", FT_UINT8,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_store_kind_data_length,
-      { "replica num",	"reload.store.kind_data.length",	FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "replica num",  "reload.store.kind_data.length",  FT_UINT32,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_storeans_kind_responses,
-      { "Kind Responses",	"reload.storeans.kind_responses", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "Kind Responses", "reload.storeans.kind_responses", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_storeddataspecifiers,
-      { "StoredDataSpecifiers",	"reload.storeddataspecifiers", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "StoredDataSpecifiers", "reload.storeddataspecifiers", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_fetchans,
-      { "FetchAns",	"reload.fetchans", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "FetchAns", "reload.fetchans", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_kind_responses_length,
       { "Kind Responses Length", "reload.fetchans.kind_responses.length", FT_UINT32,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_statans,
-      { "StatAns",	"reload.statans", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "StatAns",  "reload.statans", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_findreq_kinds_length,
-      { "Kinds Length",	"reload.findreq.kindslength", FT_UINT8,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Kinds Length", "reload.findreq.kindslength", FT_UINT8,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_findans_results_length,
-      { "Results Length",	"reload.findans.resultsslength", FT_UINT16,
-        BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
+      { "Results Length", "reload.findans.resultsslength", FT_UINT16,
+        BASE_DEC, NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_findkinddata,
-      { "FindKindData",	"reload.findkinddata", FT_NONE,
-        BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
+      { "FindKindData", "reload.findkinddata", FT_NONE,
+        BASE_NONE,  NULL, 0x0,  NULL, HFILL }
     },
     { &hf_reload_fragment_overlap,
-      { "Fragment overlap",	"reload.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+      { "Fragment overlap", "reload.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "Fragment overlaps with other fragments", HFILL }},
 
     { &hf_reload_fragment_overlap_conflict,
-      { "Conflicting data in fragment overlap",	"reload.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+      { "Conflicting data in fragment overlap", "reload.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "Overlapping fragments contained conflicting data", HFILL }},
 
     { &hf_reload_fragment_multiple_tails,
-      { "Multiple tail fragments found",	"reload.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+      { "Multiple tail fragments found",  "reload.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "Several tails were found when defragmenting the packet", HFILL }},
 
     { &hf_reload_fragment_too_long_fragment,
-      { "Fragment too long",	"reload.fragment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+      { "Fragment too long",  "reload.fragment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "Fragment contained data past end of packet", HFILL }},
 
     { &hf_reload_fragment_error,