Minor: reformatting, unneeded #includes, whitespace cleanup;

Also: use val_to_str_const(0 instead of val_to_str() in a few cases.

svn path=/trunk/; revision=42271

1 files changed, 373 insertions, 301 deletions

diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c
index d002d61f2b..8c8ab1fe96 100644
--- a/epan/dissectors/packet-dtpt.c
+++ b/epan/dissectors/packet-dtpt.c
@@ -162,7 +162,7 @@ static const value_string names_message_type[] = {
 };
 
 static const value_string names_error[] = {
-	{	0, "OK" },
+	{	0,     "OK" },
 	{	10014, "WSAEFAULT" },
 	{	10060, "WSAETIMEDOUT" },
 	{	10108, "WSASERVICE_NOT_FOUND" },
@@ -171,7 +171,7 @@ static const value_string names_error[] = {
 };
 
 static const value_string names_family[] = {
-	{	WINSOCK_AF_INET,	"AF_INET"	},
+	{	WINSOCK_AF_INET, "AF_INET"	},
 	{	0, NULL	}
 };
 
@@ -834,300 +834,372 @@ void proto_reg_handoff_dtpt(void);
 void
 proto_register_dtpt(void)
 {
-  static hf_register_info hf[] = {
-    { &hf_dtpt_version,
-      { "Version", "dtpt.version",
-	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"Protocol Version", HFILL }},
-    { &hf_dtpt_message_type,
-      { "Message Type", "dtpt.message_type",
-	FT_UINT8, BASE_DEC, VALS(names_message_type), 0x0,
-	"Packet Message Type", HFILL }},
-    { &hf_dtpt_flags,
-      { "ControlFlags", "dtpt.flags",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"ControlFlags as documented for WSALookupServiceBegin", HFILL }},
-    { &hf_dtpt_flags_deep,
-      { "DEEP", "dtpt.flags.deep",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_DEEP,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_containers,
-      { "CONTAINERS", "dtpt.flags.containers",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_CONTAINERS,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_nocontainers,
-      { "NOCONTAINERS", "dtpt.flags.nocontainers",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_NOCONTAINERS,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_nearest,
-      { "NEAREST", "dtpt.flags.nearest",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_NEAREST,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_return_name,
-      { "RETURN_NAME", "dtpt.flags.return_name",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_NAME,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_return_type,
-      { "RETURN_TYPE", "dtpt.flags.return_type",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_TYPE,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_return_version,
-      { "RETURN_VERSION", "dtpt.flags.return_version",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_VERSION,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_return_comment,
-      { "RETURN_COMMENT", "dtpt.flags.return_comment",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_COMMENT,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_return_addr,
-      { "RETURN_ADDR", "dtpt.flags.return_addr",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_ADDR,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_return_blob,
-      { "RETURN_BLOB", "dtpt.flags.return_blob",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_BLOB,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_return_aliases,
-      { "RETURN_ALIASES", "dtpt.flags.return_aliases",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_ALIASES,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_return_query_string,
-      { "RETURN_QUERY_STRING", "dtpt.flags.return_query_string",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_QUERY_STRING,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_flushcache,
-      { "FLUSHCACHE", "dtpt.flags.flushcache",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_FLUSHCACHE,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_flushprevious,
-      { "FLUSHPREVIOUS", "dtpt.flags.flushprevious",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_FLUSHPREVIOUS,
-	NULL, HFILL }},
-    { &hf_dtpt_flags_res_service,
-      { "RES_SERVICE", "dtpt.flags.res_service",
-	FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RES_SERVICE,
-	NULL, HFILL }},
-    { &hf_dtpt_payload_size,
-      { "Payload Size", "dtpt.payload_size",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Payload Size of the following packet containing a serialized WSAQUERYSET", HFILL }},
-    { &hf_dtpt_handle,
-      { "Handle", "dtpt.handle",
-	FT_UINT64, BASE_HEX, NULL, 0x0,
-	"Lookup handle", HFILL }},
-    { &hf_dtpt_error,
-      { "Last Error", "dtpt.error",
-	FT_UINT32, BASE_DEC, VALS(names_error), 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_buffer_size,
-      { "Buffer Size", "dtpt.buffer_size",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_data_size,
-      { "Data Size", "dtpt.data_size",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_queryset_rawsize,
-      { "QuerySet Size", "dtpt.queryset_size",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Size of the binary WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_size,
-      { "dwSize", "dtpt.queryset.dwSize",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"dwSize field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_service_instance_name_pointer,
-      { "lpszServiceInstanceName", "dtpt.queryset.lpszServiceInstanceName",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"lpszServiceInstanceName field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_service_class_id_pointer,
-      { "lpServiceClassId", "dtpt.queryset.lpServiceClassId",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"lpServiceClassId in the WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_version,
-      { "lpVersion", "dtpt.queryset.lpVersion",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"lpVersion in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_comment_pointer,
-      { "lpszComment", "dtpt.lpszComment",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"lpszComment field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_namespace,
-      { "dwNameSpace", "dtpt.queryset.dwNameSpace",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"dwNameSpace field in WSAQUERYSE", HFILL }},
-    { &hf_dtpt_queryset_provider_id_pointer,
-      { "lpNSProviderId", "dtpt.queryset.lpNSProviderId",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"lpNSProviderId field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_context_pointer,
-      { "lpszContext", "dtpt.queryset.lpszContext",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"lpszContext field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_protocols_number,
-      { "dwNumberOfProtocols", "dtpt.queryset.dwNumberOfProtocols",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"dwNumberOfProtocols field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_protocols_pointer,
-      { "lpafpProtocols", "dtpt.queryset.lpafpProtocols",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"lpafpProtocols field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_query_string_pointer,
-      { "lpszQueryString", "dtpt.queryset.lpszQueryString",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"lpszQueryString field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_cs_addrs_number,
-      { "dwNumberOfCsAddrs", "dtpt.queryset.dwNumberOfCsAddrs",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"dwNumberOfCsAddrs field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_cs_addrs_pointer,
-      { "lpcsaBuffer", "dtpt.queryset.lpcsaBuffer",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"lpcsaBuffer field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_output_flags,
-      { "dwOutputFlags", "dtpt.queryset.dwOutputFlags",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"dwOutputFlags field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_queryset_blob_pointer,
-      { "lpBlob", "dtpt.queryset.lpBlob",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"lpBlob field in WSAQUERYSET", HFILL }},
-    { &hf_dtpt_wstring_length,
-      { "Length", "dtpt.wstring.length",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"String Length", HFILL }},
-    { &hf_dtpt_wstring_data,
-      { "Data", "dtpt.wstring.data",
-	FT_STRING, BASE_NONE, NULL, 0x0,
-	"String Data", HFILL }},
-    { &hf_dtpt_guid_length,
-      { "Length", "dtpt.guid.length",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"GUID Length", HFILL }},
-    { &hf_dtpt_guid_data,
-      { "Data", "dtpt.guid.data",
-	FT_GUID, BASE_NONE, NULL, 0x0,
-	"GUID Data", HFILL }},
-    { &hf_dtpt_service_instance_name,
-      { "Service Instance Name", "dtpt.service_instance_name",
-	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_service_class_id,
-      { "Service Class ID", "dtpt.service_class_id",
-	FT_GUID, BASE_NONE, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_comment,
-      { "Comment", "dtpt.comment",
-	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_ns_provider_id,
-      { "NS Provider ID", "dtpt.ns_provider_id",
-	FT_GUID, BASE_NONE, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_context,
-      { "Context", "dtpt.context",
-	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_protocols_number,
-      { "Number of Protocols", "dtpt.protocols.number",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_protocols_length,
-      { "Length of Protocols", "dtpt.protocols.length",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_protocol_family,
-      { "Family", "dtpt.protocol.family",
-	FT_UINT32, BASE_DEC, VALS(names_family), 0x0,
-	"Protocol Family", HFILL }},
-    { &hf_dtpt_protocol_protocol,
-      { "Protocol", "dtpt.protocol.protocol",
-	FT_UINT32, BASE_DEC, VALS(names_protocol), 0x0,
-	"Protocol Protocol", HFILL }},
-    { &hf_dtpt_query_string,
-      { "Query String", "dtpt.query_string",
-	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_cs_addrs_number,
-      { "Number of CS Addresses", "dtpt.cs_addrs.number",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_cs_addrs_length1,
-      { "Length of CS Addresses Part 1", "dtpt.cs_addrs.length1",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_cs_addr_socket_type,
-      { "Socket Type", "dtpt.cs_addrs.socket_type",
-	FT_UINT32, BASE_DEC, VALS(names_socket_type), 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_cs_addr_protocol,
-      { "Protocol", "dtpt.cs_addrs.protocol",
-	FT_UINT32, BASE_DEC, VALS(names_protocol), 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_cs_addr_local_pointer,
-      { "Local Address Pointer", "dtpt.cs_addr.local_pointer",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_cs_addr_local_length,
-      { "Local Address Length", "dtpt.cs_addr.local_length",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Local Address Pointer", HFILL }},
-    { &hf_dtpt_cs_addr_local,
-      { "Local Address", "dtpt.cs_addr.local",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_cs_addr_remote_pointer,
-      { "Remote Address Pointer", "dtpt.cs_addr.remote_pointer",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_cs_addr_remote_length,
-      { "Remote Address Length", "dtpt.cs_addr.remote_length",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Remote Address Pointer", HFILL }},
-    { &hf_dtpt_cs_addr_remote,
-      { "Remote Address", "dtpt.cs_addr.remote",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	NULL, HFILL }},
-    { &hf_dtpt_sockaddr_length,
-      { "Length", "dtpt.sockaddr.length",
-	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"Socket Address Length", HFILL }},
-    { &hf_dtpt_sockaddr_family,
-      { "Family", "dtpt.sockaddr.family",
-	FT_UINT16, BASE_DEC, VALS(names_family), 0x0,
-	"Socket Address Family", HFILL }},
-    { &hf_dtpt_sockaddr_port,
-      { "Port", "dtpt.sockaddr.port",
-	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"Socket Address Port", HFILL }},
-    { &hf_dtpt_sockaddr_address,
-      { "Address", "dtpt.sockaddr.address",
-	FT_IPv4, BASE_NONE, NULL, 0x0,
-	"Socket Address Address", HFILL }},
-    { &hf_dtpt_blob_rawsize,
-      { "Blob Size", "dtpt.blob_size",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Size of the binary BLOB", HFILL }},
-    { &hf_dtpt_blob_size,
-      { "cbSize", "dtpt.blob.cbSize",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"cbSize field in BLOB", HFILL }},
-    { &hf_dtpt_blob_data_pointer,
-      { "pBlobData", "dtpt.blob.pBlobData",
-	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"pBlobData field in BLOB", HFILL }},
-    { &hf_dtpt_blob_data_length,
-      { "Length", "dtpt.blob.data_length",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Length of the Blob Data Block", HFILL }},
-    { &hf_dtpt_blob_data,
-      { "Data", "dtpt.blob.data",
-	FT_BYTES, BASE_NONE, NULL, 0x0,
-	"Blob Data Block", HFILL }},
-    { &hf_dtpt_connect_addr,
-      { "Address", "dtpt.connect_addr",
-	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Connect to Address", HFILL }},
-  };
+	static hf_register_info hf[] = {
+		{ &hf_dtpt_version,
+		  { "Version", "dtpt.version",
+		    FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "Protocol Version", HFILL }},
+
+		{ &hf_dtpt_message_type,
+		  { "Message Type", "dtpt.message_type",
+		    FT_UINT8, BASE_DEC, VALS(names_message_type), 0x0,
+		    "Packet Message Type", HFILL }},
+
+		{ &hf_dtpt_flags,
+		  { "ControlFlags", "dtpt.flags",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "ControlFlags as documented for WSALookupServiceBegin", HFILL }},
+
+		{ &hf_dtpt_flags_deep,
+		  { "DEEP", "dtpt.flags.deep",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_DEEP,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_containers,
+		  { "CONTAINERS", "dtpt.flags.containers",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_CONTAINERS,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_nocontainers,
+		  { "NOCONTAINERS", "dtpt.flags.nocontainers",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_NOCONTAINERS,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_nearest,
+		  { "NEAREST", "dtpt.flags.nearest",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_NEAREST,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_return_name,
+		  { "RETURN_NAME", "dtpt.flags.return_name",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_NAME,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_return_type,
+		  { "RETURN_TYPE", "dtpt.flags.return_type",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_TYPE,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_return_version,
+		  { "RETURN_VERSION", "dtpt.flags.return_version",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_VERSION,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_return_comment,
+		  { "RETURN_COMMENT", "dtpt.flags.return_comment",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_COMMENT,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_return_addr,
+		  { "RETURN_ADDR", "dtpt.flags.return_addr",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_ADDR,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_return_blob,
+		  { "RETURN_BLOB", "dtpt.flags.return_blob",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_BLOB,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_return_aliases,
+		  { "RETURN_ALIASES", "dtpt.flags.return_aliases",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_ALIASES,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_return_query_string,
+		  { "RETURN_QUERY_STRING", "dtpt.flags.return_query_string",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RETURN_QUERY_STRING,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_flushcache,
+		  { "FLUSHCACHE", "dtpt.flags.flushcache",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_FLUSHCACHE,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_flushprevious,
+		  { "FLUSHPREVIOUS", "dtpt.flags.flushprevious",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_FLUSHPREVIOUS,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_flags_res_service,
+		  { "RES_SERVICE", "dtpt.flags.res_service",
+		    FT_BOOLEAN, 32, TFS(&tfs_set_notset), LUP_RES_SERVICE,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_payload_size,
+		  { "Payload Size", "dtpt.payload_size",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Payload Size of the following packet containing a serialized WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_handle,
+		  { "Handle", "dtpt.handle",
+		    FT_UINT64, BASE_HEX, NULL, 0x0,
+		    "Lookup handle", HFILL }},
+
+		{ &hf_dtpt_error,
+		  { "Last Error", "dtpt.error",
+		    FT_UINT32, BASE_DEC, VALS(names_error), 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_buffer_size,
+		  { "Buffer Size", "dtpt.buffer_size",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_data_size,
+		  { "Data Size", "dtpt.data_size",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_queryset_rawsize,
+		  { "QuerySet Size", "dtpt.queryset_size",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Size of the binary WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_size,
+		  { "dwSize", "dtpt.queryset.dwSize",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "dwSize field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_service_instance_name_pointer,
+		  { "lpszServiceInstanceName", "dtpt.queryset.lpszServiceInstanceName",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "lpszServiceInstanceName field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_service_class_id_pointer,
+		  { "lpServiceClassId", "dtpt.queryset.lpServiceClassId",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "lpServiceClassId in the WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_version,
+		  { "lpVersion", "dtpt.queryset.lpVersion",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "lpVersion in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_comment_pointer,
+		  { "lpszComment", "dtpt.lpszComment",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "lpszComment field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_namespace,
+		  { "dwNameSpace", "dtpt.queryset.dwNameSpace",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "dwNameSpace field in WSAQUERYSE", HFILL }},
+
+		{ &hf_dtpt_queryset_provider_id_pointer,
+		  { "lpNSProviderId", "dtpt.queryset.lpNSProviderId",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "lpNSProviderId field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_context_pointer,
+		  { "lpszContext", "dtpt.queryset.lpszContext",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "lpszContext field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_protocols_number,
+		  { "dwNumberOfProtocols", "dtpt.queryset.dwNumberOfProtocols",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "dwNumberOfProtocols field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_protocols_pointer,
+		  { "lpafpProtocols", "dtpt.queryset.lpafpProtocols",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "lpafpProtocols field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_query_string_pointer,
+		  { "lpszQueryString", "dtpt.queryset.lpszQueryString",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "lpszQueryString field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_cs_addrs_number,
+		  { "dwNumberOfCsAddrs", "dtpt.queryset.dwNumberOfCsAddrs",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "dwNumberOfCsAddrs field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_cs_addrs_pointer,
+		  { "lpcsaBuffer", "dtpt.queryset.lpcsaBuffer",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "lpcsaBuffer field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_output_flags,
+		  { "dwOutputFlags", "dtpt.queryset.dwOutputFlags",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "dwOutputFlags field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_queryset_blob_pointer,
+		  { "lpBlob", "dtpt.queryset.lpBlob",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "lpBlob field in WSAQUERYSET", HFILL }},
+
+		{ &hf_dtpt_wstring_length,
+		  { "Length", "dtpt.wstring.length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "String Length", HFILL }},
+
+		{ &hf_dtpt_wstring_data,
+		  { "Data", "dtpt.wstring.data",
+		    FT_STRING, BASE_NONE, NULL, 0x0,
+		    "String Data", HFILL }},
+
+		{ &hf_dtpt_guid_length,
+		  { "Length", "dtpt.guid.length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "GUID Length", HFILL }},
+
+		{ &hf_dtpt_guid_data,
+		  { "Data", "dtpt.guid.data",
+		    FT_GUID, BASE_NONE, NULL, 0x0,
+		    "GUID Data", HFILL }},
+
+		{ &hf_dtpt_service_instance_name,
+		  { "Service Instance Name", "dtpt.service_instance_name",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_service_class_id,
+		  { "Service Class ID", "dtpt.service_class_id",
+		    FT_GUID, BASE_NONE, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_comment,
+		  { "Comment", "dtpt.comment",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_ns_provider_id,
+		  { "NS Provider ID", "dtpt.ns_provider_id",
+		    FT_GUID, BASE_NONE, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_context,
+		  { "Context", "dtpt.context",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_protocols_number,
+		  { "Number of Protocols", "dtpt.protocols.number",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_protocols_length,
+		  { "Length of Protocols", "dtpt.protocols.length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_protocol_family,
+		  { "Family", "dtpt.protocol.family",
+		    FT_UINT32, BASE_DEC, VALS(names_family), 0x0,
+		    "Protocol Family", HFILL }},
+
+		{ &hf_dtpt_protocol_protocol,
+		  { "Protocol", "dtpt.protocol.protocol",
+		    FT_UINT32, BASE_DEC, VALS(names_protocol), 0x0,
+		    "Protocol Protocol", HFILL }},
+
+		{ &hf_dtpt_query_string,
+		  { "Query String", "dtpt.query_string",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_cs_addrs_number,
+		  { "Number of CS Addresses", "dtpt.cs_addrs.number",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_cs_addrs_length1,
+		  { "Length of CS Addresses Part 1", "dtpt.cs_addrs.length1",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_cs_addr_socket_type,
+		  { "Socket Type", "dtpt.cs_addrs.socket_type",
+		    FT_UINT32, BASE_DEC, VALS(names_socket_type), 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_cs_addr_protocol,
+		  { "Protocol", "dtpt.cs_addrs.protocol",
+		    FT_UINT32, BASE_DEC, VALS(names_protocol), 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_cs_addr_local_pointer,
+		  { "Local Address Pointer", "dtpt.cs_addr.local_pointer",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_cs_addr_local_length,
+		  { "Local Address Length", "dtpt.cs_addr.local_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Local Address Pointer", HFILL }},
+
+		{ &hf_dtpt_cs_addr_local,
+		  { "Local Address", "dtpt.cs_addr.local",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_cs_addr_remote_pointer,
+		  { "Remote Address Pointer", "dtpt.cs_addr.remote_pointer",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_cs_addr_remote_length,
+		  { "Remote Address Length", "dtpt.cs_addr.remote_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Remote Address Pointer", HFILL }},
+
+		{ &hf_dtpt_cs_addr_remote,
+		  { "Remote Address", "dtpt.cs_addr.remote",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    NULL, HFILL }},
+
+		{ &hf_dtpt_sockaddr_length,
+		  { "Length", "dtpt.sockaddr.length",
+		    FT_UINT16, BASE_DEC, NULL, 0x0,
+		    "Socket Address Length", HFILL }},
+
+		{ &hf_dtpt_sockaddr_family,
+		  { "Family", "dtpt.sockaddr.family",
+		    FT_UINT16, BASE_DEC, VALS(names_family), 0x0,
+		    "Socket Address Family", HFILL }},
+
+		{ &hf_dtpt_sockaddr_port,
+		  { "Port", "dtpt.sockaddr.port",
+		    FT_UINT16, BASE_DEC, NULL, 0x0,
+		    "Socket Address Port", HFILL }},
+
+		{ &hf_dtpt_sockaddr_address,
+		  { "Address", "dtpt.sockaddr.address",
+		    FT_IPv4, BASE_NONE, NULL, 0x0,
+		    "Socket Address Address", HFILL }},
+
+		{ &hf_dtpt_blob_rawsize,
+		  { "Blob Size", "dtpt.blob_size",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Size of the binary BLOB", HFILL }},
+
+		{ &hf_dtpt_blob_size,
+		  { "cbSize", "dtpt.blob.cbSize",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "cbSize field in BLOB", HFILL }},
+
+		{ &hf_dtpt_blob_data_pointer,
+		  { "pBlobData", "dtpt.blob.pBlobData",
+		    FT_UINT32, BASE_HEX, NULL, 0x0,
+		    "pBlobData field in BLOB", HFILL }},
+
+		{ &hf_dtpt_blob_data_length,
+		  { "Length", "dtpt.blob.data_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Length of the Blob Data Block", HFILL }},
+
+		{ &hf_dtpt_blob_data,
+		  { "Data", "dtpt.blob.data",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "Blob Data Block", HFILL }},
+
+		{ &hf_dtpt_connect_addr,
+		  { "Address", "dtpt.connect_addr",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "Connect to Address", HFILL }},
+	};
 	static gint *ett[] = {
 		&ett_dtpt,
 		&ett_dtpt_flags,
@@ -1150,17 +1222,17 @@ proto_register_dtpt(void)
 	guids_add_guid(&guid_svcid_inet_hostaddrbyinetstring, "SVCID_INET_HOSTADDRBYINETSTRING");
 
 	proto_dtpt = proto_register_protocol("DeskTop PassThrough Protocol",
-					"DTPT", "dtpt");
+					     "DTPT", "dtpt");
 	proto_register_field_array(proto_dtpt, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
 	/* Register a configuration option for port */
 	dtpt_module = prefs_register_protocol(proto_dtpt,
-		proto_reg_handoff_dtpt);
+					      proto_reg_handoff_dtpt);
 	prefs_register_uint_preference(dtpt_module, "tcp.port",
-					"DTPT Server TCP Port",
-					"Set the TDP port for the DTPT Server",
-					10, &gbl_dtptServerPort);
+				       "DTPT Server TCP Port",
+				       "Set the TDP port for the DTPT Server",
+				       10, &gbl_dtptServerPort);
 }